From: Kenichi Handa <handa@gnu.org>
Date: Sun, 10 Mar 2013 14:43:58 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~585
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a6ebf83d9065b9b32231cd544d70195fb7ba97ae;p=emacs.git

merge trunk
---

a6ebf83d9065b9b32231cd544d70195fb7ba97ae